Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.2] revert 4.3er changes out of 4.2-dev #2691

Merged
merged 8 commits into from
Dec 18, 2022
Merged

[4.2] revert 4.3er changes out of 4.2-dev #2691

merged 8 commits into from
Dec 18, 2022

Conversation

zero-24
Copy link
Member

@zero-24 zero-24 commented Dec 18, 2022

@tecpromotion @heelc29 please double check this PR. With this PR I would like to revert the 4.3er changes merged into 4.2 once we merge this PR and do an upmerge to 4.3 we need to re apply said changes to 4.3-dev

@zero-24 zero-24 added this to the 4.2.7v1 milestone Dec 18, 2022
tecpromotion
tecpromotion previously approved these changes Dec 18, 2022
View reviewed changes
Copy link
Member

@tecpromotion tecpromotion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many Thanks Tobi.

I would maybe even just leave the alphabetical sorting as it is.
So I would leave the changes as they are now.

script.php Outdated Show resolved Hide resolved
@zero-24 @tecpromotion
Update script.php
93478c8 
Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
@zero-24
Copy link
Member Author

zero-24 commented Dec 18, 2022

I would maybe even just leave the alphabetical sorting as it is.
So I would leave the changes as they are now.

Can you please clarify? I have "just" manually reverted the changes merged into 4.2 that should be only merged into 4.3.

Do you mean to close this PR and keep the changes merged and released and not revert them back?

@tecpromotion
Update com_media.ini
9198bcd 
alpha sorting
tecpromotion
tecpromotion previously approved these changes Dec 18, 2022
View reviewed changes
@tecpromotion
Copy link
Member

I would maybe even just leave the alphabetical sorting as it is.
So I would leave the changes as they are now.

Can you please clarify? I have "just" manually reverted the changes merged into 4.2 that should be only merged into 4.3.

Do you mean to close this PR and keep the changes merged and released and not revert them back?

Just my com_media commit.

@tecpromotion
Copy link
Member

@heelc29 please also check this pr.

@zero-24
Copy link
Member Author

zero-24 commented Dec 18, 2022

So this @tecpromotion : 727e74c ?

@tecpromotion
Copy link
Member

So this @tecpromotion : 727e74c ?

see c110d00

tecpromotion
tecpromotion previously approved these changes Dec 18, 2022
View reviewed changes
@zero-24 @heelc29
Update administrator/language/de-DE/com_tags.ini
f390683 
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
@tecpromotion tecpromotion merged commit 670c89f into joomlagerman:4.2-dev Dec 18, 2022
@zero-24 zero-24 deleted the cleanupbranch branch December 18, 2022 17:16
@zero-24
Copy link
Member Author

zero-24 commented Dec 18, 2022

Ok will go and merge this up and send a PR to re apply this changes

@zero-24 zero-24 mentioned this pull request Dec 18, 2022
Merged
@zero-24
Copy link
Member Author

zero-24 commented Dec 18, 2022

PR done here: #2694 (comment)

tecpromotion added a commit that referenced this pull request Dec 19, 2022
@tecpromotion
Merge pull request #2694 from zero-24/reapply43dev
5f9aa84 
[4.3] re apply 4.3-dev #2691
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@heelc29 heelc29 heelc29 approved these changes

@tecpromotion tecpromotion tecpromotion left review comments

Assignees

@zero-24 zero-24

Labels
None yet
Milestone
4.2.7v1
Development

Successfully merging this pull request may close these issues.
3 participants
@zero-24 @tecpromotion @heelc29